loginDialog: fix cancel from "Not Listed?"

Since commit 1ae0fadbf483128e27565baba6e8684bc5defca2 we
no longer start a PAM conversation as soon as the user clicks
the "Not Listed?" button.  Instead we defer starting the PAM
conversation until the user types their username.

Unfortunately, the cancel button resets the dialog back to the
user list indrectly by cancelling the current PAM conversation.

This means if the user hasn't yet entered thier username then
the cancel button doesn't work.

This commit performs a direct dialog reset in the case the
PAM conversation hasn't been started yet.

https://bugzilla.gnome.org/show_bug.cgi?id=693756

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 1c09c29eba4753830ae48c7e303b59c243d1b2f9..d2b93ba729766e30f1d5a5ae4e5ced2169970b97 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -894,7 +894,10 @@ const LoginDialog = new Lang.Class({
     },
 
     cancel: function() {
-        this._userVerifier.cancel();
+        if (this._verifyingUser)
+            this._userVerifier.cancel();
+        else
+            this._reset();
     },
 
     _fadeInPrompt: function() {